From 08313a31cd6f3b8f8af0e62ba25f9c5cade2dcb8 Mon Sep 17 00:00:00 2001 From: Jakub Bukaj Date: Thu, 12 Mar 2015 11:42:59 +0100 Subject: [PATCH] Update to the latest nightly --- Cargo.lock | 42 ++++++++++++++++---------------- src/cargo/lib.rs | 2 +- src/cargo/ops/cargo_rustc/mod.rs | 2 +- src/cargo/sources/git/source.rs | 2 +- src/cargo/sources/registry.rs | 2 +- src/rustversion.txt | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1285b0254..fc044abef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,16 +4,16 @@ version = "0.1.0" dependencies = [ "advapi32-sys 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.6.45 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 0.6.47 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "git2-curl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "registry 0.1.0", "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -24,7 +24,7 @@ dependencies = [ "time 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -32,7 +32,7 @@ name = "advapi32-sys" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -59,16 +59,16 @@ dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "docopt" -version = "0.6.45" +version = "0.6.47" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -78,7 +78,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -119,7 +119,7 @@ dependencies = [ [[package]] name = "glob" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -129,10 +129,10 @@ source = "git+https://github.com/carllerche/hamcrest-rust.git#c90897390602ef1ad2 [[package]] name = "kernel32-sys" -version = "0.0.10" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -149,7 +149,7 @@ dependencies = [ "libssh2-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -168,7 +168,7 @@ dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -176,7 +176,7 @@ name = "libz-sys" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -206,12 +206,12 @@ dependencies = [ "gcc 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pkg-config" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -269,9 +269,9 @@ name = "term" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -307,7 +307,7 @@ dependencies = [ [[package]] name = "winapi" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index a09b47adf..348cec6d0 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -1,5 +1,5 @@ #![deny(unused)] -#![feature(hash, os, std_misc, unicode, core)] +#![feature(hash, os, std_misc, core)] #![feature(io, path, str_words, old_io, exit_status, fs_time)] #![cfg_attr(test, deny(warnings))] diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 2b4a4fa9e..feeb312f4 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -733,7 +733,7 @@ fn each_dep<'a, F>(pkg: &Package, cx: &'a Context, mut f: F) fn envify(s: &str) -> String { s.chars() - .map(|c| c.to_uppercase()) + .flat_map(|c| c.to_uppercase()) .map(|c| if c == '-' {'_'} else {c}) .collect() } diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index 3b4f866b6..b3fc782e5 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -116,7 +116,7 @@ pub fn canonicalize_url(url: &Url) -> Url { rel.default_port = Some(443); let path = mem::replace(&mut rel.path, Vec::new()); rel.path = path.into_iter().map(|s| { - s.chars().map(|c| c.to_lowercase()).collect() + s.chars().flat_map(|c| c.to_lowercase()).collect() }).collect(); } _ => {} diff --git a/src/cargo/sources/registry.rs b/src/cargo/sources/registry.rs index e4e45bd58..3159aa9c0 100644 --- a/src/cargo/sources/registry.rs +++ b/src/cargo/sources/registry.rs @@ -365,7 +365,7 @@ impl<'a, 'b> RegistrySource<'a, 'b> { } // see module comment for why this is structured the way it is let path = self.checkout_path.clone(); - let fs_name = name.chars().map(|c| c.to_lowercase()).collect::(); + let fs_name = name.chars().flat_map(|c| c.to_lowercase()).collect::(); let path = match fs_name.len() { 1 => path.join("1").join(&fs_name), 2 => path.join("2").join(&fs_name), diff --git a/src/rustversion.txt b/src/rustversion.txt index 427618d48..d9ca78f0e 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2015-03-09 +2015-03-11 -- 2.30.2